From eccdcc9b5f7393ae6b3b913b237302a71681ab7f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 2 May 2004 09:06:56 +0000
Subject: [PATCH] Don't load user session in command line mode; this can bork
 web-based reinstalls in some circumstances (bug 941461)

---
 config/index.php   | 1 +
 includes/Setup.php | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/index.php b/config/index.php
index 1967246d55..e14766d5d9 100644
--- a/config/index.php
+++ b/config/index.php
@@ -168,6 +168,7 @@ class ConfigData {
 
 ?>
 
+<p><i>Please include all of the lines below when reporting installation problems.</i></p>
 
 <h2>Checking environment...</h2>
 <ul>
diff --git a/includes/Setup.php b/includes/Setup.php
index 78dd88bacf..cb13872029 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -165,7 +165,13 @@ if( !$wgCommandLineMode && ( isset( $_COOKIE[ini_get("session.name")] ) || isset
 }
 
 $wgBlockCache = new BlockCache( true );
-$wgUser = User::loadFromSession();
+if( $wgCommandLineMode ) {
+	# Used for some maintenance scripts; user session cookies can screw things up
+	# when the database is in an in-between state.
+	$wgUser = new User();
+} else {
+	$wgUser = User::loadFromSession();
+}
 $wgDeferredUpdateList = array();
 $wgLinkCache = new LinkCache();
 $wgMagicWords = array();
-- 
2.20.1